Added Config Utility class as well as changed updated references