LogModel refactored