Reacting to ModelBuilder API change