Added support for mixed scenarios