Switch to modelBuilder

/to @ritch