Working on RTOS support