Completed updating factor/subfactor JSON according to Kat