Lots of work on configuration manager