Removed Payload extractor as we dont need it