Removed need for rows to be case classes