Shorter timeout
Add language detection