Fixes #171 Refactor Options internally to use Optional everywhere