Improved management scenarios

Summary
Improved management scenarios