Interdependencies and Isolation factory fix