Added remove and rename functions.