Added save/update callbacks