Added Payload Checking