Oomodel enhancements

Adjustments to support more template constructs