Add affinity setting, submission log capture