Add support for calls without service description