Added rs and rt mapping