Add support for dynamic combos to new capabilities DTOs

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>