Modeling career

Reworked model classes.