Extension of CONTACT for Switches and Crossings and Demonstration for S&C Benchmark Cases