Support add/remove API