DEV: Prepare for add/del functions