Improve messenger