improve api compatibility in the .save and .remove path