Add Null Converter, update HashStrategy