Add termination management