Updated with category code