Further improvements to RState