Moved map to its own class