update to include even more file structures