Moved variables in subsystems to private