- Updated class