#488 Improved api examples