Mostly refactor of existing Migrators created by me