Modified new / view to use the new typeId / componentTypeId fields