WhiskChat optimizations