Support for Relay Modern

Ref: