Added update and remove