Improve messages support