Enhancement engine/data classes

Illia Oleksiienkorequested to merge
enhancement-data-classes into master

Created by: stefaniapedrazzi

Fix comment

Merge request reports