Some migration changes, along with model definitions