Added several scenarios for new dashboard support