Added better auto completion