Support more 'missing data' cases