Refactored to inject helper rather than extending it.