Updated cpec/classes