updated w/factoryId field