class model changes