Updated language handling