Allow pillar swaps on entity dependent value ranges