Added request parsing