Added retroactive changes from modeler.