Updated to remove ServicesSettings