Refactored map editing workflow