updated classes/models