Updated language mapping