Migrating to punch generated static version