Added few fields to ServiceDescriptor