Update Handler(s) to prevent memory leak