Added a category dictionary to parser