Incorporate rcm support