Updated TODO in factory manager