Add TagIcon and TagEula.  Remove start and end from EulaSnippet