Single message link and some improvements