Spiked out the switch to Yaml Configuration