Refactor - change custom_fields to signed_custom_fields