Merge pull request #6 from mectwork/category-with-dql-fit

Refactored CategoryManager using dql fits