ENH: Updated model builder code.