Preparing the ModelBuilder classes to be refactored in to a better DSL for building models.