Updated full Polymer support