Improved the examples in Service Format