Completed encapsulation of map functionality.