Add more to the data model
Fix migrations