Big refactoring of map feature creation and destruction