Updated bot support