Added rstate version scheme