More functionality for add and remove functions