added back support for model delivery