Added Map Functionality