Add CategorySOA and ManufacturerSOA