Add sugar for autofill