Added default value for null attributes
Added default value for null attributes