Map functionality added