make add/remove to abstract collections safe