Add nullOnly flag for annotations