Logs model extended && refactored