Improve missed values handling