Fixed doc and Option type const