Update references to new handler objects