Adding more request parsing