Improve subscription messaging