Refine language handling