DTOs added, Model changed