Added map functionality.