Separated mapper interface from DAO
Fixed error and added SQLs