Moved members of Option-class from public to private