Add logic for add/modify/remove