This looks like changes from a separate PR. Were these changes intended to be included in this PR? Also, I don't see the new UtilityEncoder included here at all.