Rework models and migrations