Add category logic, some add object data setting fixes.