Making the demand model objects compliant with the Model Object Checklist