Replaced event handlers by new observers