Changed to a more suitable name
Added serviceId to JSON document