Added the option to include additional dictionaries, and improved the behavior of the definition area