Changed update methods to use ChangeSet object. WIP