Improvement for Bot Service codes