Improve missing data cases