Modified the CDLv1 grammar