Add remove and remplace functions