Logs model refactoring