Adding Configuration Management