add map tagging and persistence