Added support for older scenarios