Updated to support 0.7.0's chat