+ Separate Undefined and Null explicitly in encoder