Added serialization of nulls