Typecheck Option extension classes as much as possible
Added @TypeChecked annotation on a set of classes
More type checking