ScenariosService + renaming DAOs beans + minor changes