Remove redundent code
Add more resources
add scenarioDao