Refactor utility to mimic F4