PIM-1489 : Refactoring Category Helper