refactor mapper code
Fix to skip proxying of the mappers, which cause spring exceptions