Improved scenarios consistency