Added update implementation.
Merge remote-tracking branch 'origin/Experimental'