improve RecordModel class