Move instance handlers setting to handler factory