Merge "DDD implementation"