Separated mapper from DAO