updated grammar with Defs and Id Token and some more