[BUGFIX] Add missing class properties