Import Optimisation
Getting rid of ConfigurationHolder #TMART-64