Add look up in store before create flows