Refactor DB Mapper