Adapt to handler change