Added rtw mapping