Add NullableWrapper.class and JsonRawProvider.class