More subsystems externalised.
Update to support more subsystems.
Fixed a typo.