Map refactoring, text adaptations