Added option to use non-default grammar