Agreed, I just copied the same code from ModelBase but change the way it gets built, but I wanted to preserve the actual code from @ericf