Add some more functionality to add and remove