updated Models

Subject to changes.