polymer-5: streamline annotation code and data-structure