Added support for partial service description
Added support for mandatory services