Tweaks to add and remove functionality