Updated model classes.