Added Shape and Category