More work on the Config Manager.