Reduce usage of submission.language