Restructure models to support multiple outcomes of a shot