This situation is improved upon in the Richer Event Descriptions (RED;O'Gorman et al., 2016) and Situation Entities (SitEnt; Friedrich and Palmer, 2014a,b;Friedrich et al., 2015;Friedrich and Pinkal, 2015b,a;Friedrich et al., 2016) frameworks, which annotate both NPs and entire clauses for genericity.
sitEnt, which is used to annotate MAsC (Ide et al., 2010) and Wikipedia, has the nice property that it recognizes the existence of abstract entities and lexical aspectual class of clauses' main verbs, along with habituality and genericity.