Added class loader to class enhancer
Optimized imports