Ru lang and account index map logic update