Update with attach/detach changes