Added RS and ORS builtin valiable support