More changes for auto fill