- Improved handlers behavior.