refactor mapper associations