Add call close management