Added polymer framework