Added functionality for deleting/adding