Slight change to ChatAPI implementation
Expand ChatAPI