Improvement on Dialog Handling