Added missing elements to grammar
Added elements to derivedstate computer