Added dao + data