Feature/better message reporter