Updated code to include map annotations