Feature/terminate manager