Redesign model classes.