Changes for JCS service