Update to modern polymer