Changes to schema and ConfigService implementation