Add missing type definitions and fix the one for the base class
Attach a file by drag & drop or click to upload
