Feature/add/remove/multiple