Add router waitOn for product variant dependency