Simplification of class loading