Added short symbol support.