Added dao support