Several changes ttrap manager