Adds autofill capability