Improve Symbol detection