Categorys refactoring...