Improved OptionalFunctorExample