switch to a simpler flow.Map design