Adding NullBoolean support