Moved map into separate file