Fixed bugs in updates and removes caused by decoupling data