Cleanup + new hg-map directive