Integrated schema from basic models.

Forgot to rake db:migrate for last commit.