Added auto completion