Added base dao logic