move mappers to scope