Changes for null attribute