More reliable request parsing