Constructors added to domain classes
Merge origin/master