Add support for missing level 2 directives
Merge branch 'level2_directives'