Converted feature add/remove to use automatic signal/slots