Sort of a stage commit - added the model definition class