Add the check for the manual payload setting