Added the appropriate class loaders