Improve the examples maintenance