More polyfilling and prepare to serialize form