Products categories refactorization