Added migration and not-null validation to the model. Updated specs.

#3643