Added new data for null handling