Added invariant indicator to ComponentModel