Changed the way maps are loaded