Update Models, Migrations

1. Changed Models according to previous commit details.
2. Changed Init Migrations Accordingly.