Upgraded to Polymer 0.5