Added auto fill in demo