Improved load of class