Add remove and edit functions