NEW builder for grammar v2