Add remove and dispose functions.