Add device master support