Changed define-handler function.