Updates for Factory