Scenario enabled by default and graphs improvements