ServiceGroup related changes