added generic-arguments to the grammar