Added update mechanism