Added dao layer