Improved Option with pattern matching