Improve for auto completion