Adding simple auto completion