more types and keywords - cs 2.1.X support