Replaced references to use-handler with new-handler