Update models to use recent changes to Record