Some changes to scenarios and classes