added a check for standard types
added check for type in lexer