Added category and category type field