Add uniquify and save hook