Move changes tracking to separate file
Correctly add new suggestions on suggestion import