Change to Value type for Option. Closes #1