Started to update service and context reference code to support fragmented communication