move handler to configure