updated mappers and DTOs