- Improved for auto completion.