Better managing of states / events / stopping workers