Add basic support for Option