Services Configuration Refactor