Fixed build issue and added clients DTO