Merge "Added Update and Remove commands code"