Add language mapping
Rephrase some steps