Handle add/remove entities on update