improve :add, :rm