updating urls
adding fromJson with Type
updating parsing of glossary as HashMap