Import Optimisation
Getting rid of deprecated ConfigurationHolder #TMART-64