furthur change to adopt DDD