Minor updates to the core class spec.