Updated class references.