Improve RPS class