OZP-303: Simplifying the ConfigStore