Revert "Revert "Improves setup manager implementations""

This reverts commit f133ab2550b4e2d6a4232433f92962fb8c875bc1.