What I do for my Elf is, in the on the Attributes and Ablities tab, there is an attribute field call rtype. it's RollType and it asks you for each thing you click, if it's Normal, Advantage, Elven Accuracy or Disadvantage. so just use EA for attacks, regular Advantage for checks etc. That way all your attacks stay normal, but it just adds a new option on the rolls. So replace the default rtype with: {{query=1}} ?{Advantage?|Normal Roll,&#123&#123normal=1&#125&#125 &#123&#123r2=[[0d20|Advantage,&#123&#123advantage=1&#125&#125 &#123&#123r2=[[1d20|Elven Accuracy,&#123&#123advantage=1&#125&#125 &#123&#123r2=[[2d20k1|Disadvantage,&#123&#123disadvantage=1&#125&#125 &#123&#123r2=[[1d20}