Additional changes for model support.