null value support added :sparkles: