Refactored log message classes