Updated: Migrate to new configuration manager style