Class auto loading corrected