mappers and hydrators initial refactor