Refactor the Record model to Entry