updated find and findAll to return the record itself