Added more categories to dictionary