Abstract chats storage class
Merge branch 'master' into API10