Improved the handling of pid and language columns