Added autofill functionality