Added historical and options oriented tags