Make the add/remove/delete interfaces work