Adding in polymer/x-tag support