* Wrap up opt-in behavior * Verify needs to be called after * 🎨 * 🎨 * Fix service creation * 🛠️ * 🐛 fix