[COOK-2644] Extend variables