Added remove and update functionality