[IMP] Improve message log