Improved handlers management