Continuous work on scenario model implementation