Added dictionary, added support for hyphens