Extend slave handler