Add application message controller plugin
Fix bug