Refactoring of the model.
Removed RecordBuilder as it was only used in one UnitTest