Changes made for RT support