Made the dao return the wrapper objects for some of the methods
merge