Add 'EVENT and 'ACTIVE to new code generator