Added support for RWD