Added more mappers
DAO implementation changes