Redesign record class