update for auto loading of classes