adjustments for better understanding of the issue with domain classes