Added map functionality