Temporarily take out event notifier until proper implementation