Add remove address feature