Add some minimal interaction to add-handler command