Improve messaging flow