Refactor Category service