Refactor, simplify ImportChange data type