Change Policies
Add shutdown wrapper