Changed Category class