Subsystem modularity improvements