Changed the category parsing