Added refernceId handling for other services.