Ability to add map topic later