Added mapping, corrected languages and previous_wyd