Added dao interfaces and fixed entities