Reorganized to be like most polymer elements