More migrations and changes