Refactored service and method descriptions for better indirect method support