Finished implementation of Config switches