Split listeners and tasks into classes
End task on disable