Updated dictionary export to support class directives.