Support manager refactoring