Updates to Configuration for mocking