change to the way handlers and auth extend occurs