Added search for subsystems