Fix multi model support