LAMBDA-96: changed class attributes of fields