Modified Category class