Added custom closure event listener