Moved debug listeners to separate classes