Add map feature to instance

This was nicely rebased with my previous pull request, but I neglected to force-push it. Sorry.