More comprehensive dictionary added