Added support for rcm