Added some more missing class fields.