Updated class model