Added service descriptors support