Move to using a slightly different style with the DAO objects