SoulIntentionManager refactoring