Modify GenericDao for simpler usage