Added enter/exit hooks to handlers