Update to match latest SS re-factor