Changed universal class loaders, to take account of existing classes