added conditions and flows retriever