Improves setup manager implementations