Removing my custom fields and adding the hs_context serialization