added handling annotations for maps
added handling annotations for maps