Extend fields used in model building
Incorporate newly extended fields into model environment
Clean up base code