Refactor journalist model