My immediate reaction says to split them into separate categories. However I think best practice would be to table this discussion until Requiem comes out and we know exactly what we're dealing with.