Moved the flow token look up into the message hash instead of having to look it up every time in the modules