Fix client-side Shot model to support api changes