added support for @lang and @choice constructs