added map annotation support