updated to support upcoming new flow properties