Further refactor migrations for simplicity