begin webapps review
added dict in injection
refactoring