More fixes to subtyping in state space components
Defined master state space class