Drop system out
Merge configuration manager implementations
Do not expose more then needed