New Categorisation Engine Refactored