Record model refractored