Refactored to generic helper cookbook