Adding better support for struct/string/arrays are compatible with null