Update parsed data format + added several DB models