Add grammar
Type checking