Added additional classes, updated others.