[REFACTORING] Refactored category api