Moved map into seperate module