Added exptected infoflows after refactoring