Update to re-use existing helpers