Updated dictionary and verb handling