Added update parameter and fixes