Updated classes and items