Some types and reserved words added.