TOSCA model enhancements