Automate polyfilling