Improve code with more examples