Made code more DDD