Bugfix - switch from class attributes to record attributes