refactoring of mapping syntax, WIP