Added headers and query string separator support