Add update and remove functions