Removed usage of ConfigurationHolder, instead used Holders ;