Improved the service stub discussion