Added parsing of all but dot and quote