Updated model support