[JBJCA-1183] Unify metadata