Handlers protocol enhancement