Event presence handler refactoring

Related: #207