improve the validators to make clear which combinations are allowed