Added support for relay