Refactor reagent wrappers