Add When to use a separate branch