Started to add shamchat support