Added universal dao