Separate the modelBuilder ref from dataSource

/to @ritch