Adding map functionality.