Merge DataModel & Library, updated parser & updater