Updated class