added DTO and additional fields