Update RSM handling in demo client
0.10.1