Added some class fields/attributes.