Add Result and more stuff to Option