Updates for latest language changes