Adjustements for model support