Add device (16/18)

Add device