Improve mappings.dict
Improve command dictionaries