Added event handlers to subscriber (currently untested)