Add Nullable and NotNull annotations