Changed handling of map files
Move apikey from separate file to --configure stage