Added support for relay devices