Added class fields