Scenarios improvements