Improving model support