Keep model id and report ID in shell state