Add device and terminate feature