Continue refining add, updata, remove and restore