Adds possibility to fulfill dependency and fixes some issues in Flow