Manage collection behavior more carefully when enterprise is in play