Improved Optional example
Improved more examples