Added Map Funtions