Moved single, repeat and consume to clientstate object