Adding command and chat support