Added generic dao