Refactoring: using now a provate class as shared data class
Merge branch 'refactoring' into feature-3-refactoring-properties