improve incomplete data handling