Some more improvements on adding and removing
Problems with persistence