Refactor for current configuration manager