Reorg of helpers to support overriding