Adapted tasks to separation between factories and instances