Revert "Revert "Handler Changes""

This reverts commit b91253d71e9488b152a8c4692255525820faedf0.