Key classes and categories have been added.