Added an extra lock for SubSystems