Moved map to separate class