Add and remove for internal api defined