Improvements for the documentation examples