updated class models