giza: migration refactor