Improved API mockup according to documentation examples.