Improve active message