Allow more map annotation functions to support #210