Added support for Optional.