modified class and module triggers
some additions