added DTO's and updated Entities