made adjust ments for class autoloading