diff --git a/biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionPrediction.java b/biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionPrediction.java
index 7b6ae392..99523452 100644
--- a/biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionPrediction.java
+++ b/biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionPrediction.java
@@ -24,40 +24,80 @@
 
 public class ProteinSubstitutionPrediction {
 
+    private String chromosome;
+    private int position;
+    private String reference;
     private String transcriptId;
     private String uniprotId;
-    private int position;
+    private int aaPosition;
     private String aaReference;
     private String source;
-    private List<ProteinSubstitutionScore> scores;
+    private String version;
+    private List<ProteinSubstitutionPredictionScore> scores;
 
     public ProteinSubstitutionPrediction() {
         this.scores = new ArrayList<>();
     }
 
-    public ProteinSubstitutionPrediction(String transcriptId, String uniprotId, int position, String aaReference, String source,
-                                         List<ProteinSubstitutionScore> scores) {
+    public ProteinSubstitutionPrediction(String chromosome, int position, String reference, String transcriptId, String uniprotId,
+                                         int aaPosition, String aaReference, String source, String version,
+                                         List<ProteinSubstitutionPredictionScore> scores) {
+        this.chromosome = chromosome;
+        this.position = position;
+        this.reference = reference;
         this.transcriptId = transcriptId;
         this.uniprotId = uniprotId;
-        this.position = position;
+        this.aaPosition = aaPosition;
         this.aaReference = aaReference;
         this.source = source;
+        this.version = version;
         this.scores = scores;
     }
 
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("ProteinSubstitutionPrediction{");
-        sb.append("transcriptId='").append(transcriptId).append('\'');
-        sb.append(", uniprotId='").append(uniprotId).append('\'');
+        sb.append("chromosome='").append(chromosome).append('\'');
         sb.append(", position=").append(position);
+        sb.append(", reference='").append(reference).append('\'');
+        sb.append(", transcriptId='").append(transcriptId).append('\'');
+        sb.append(", uniprotId='").append(uniprotId).append('\'');
+        sb.append(", aaPosition=").append(aaPosition);
         sb.append(", aaReference='").append(aaReference).append('\'');
         sb.append(", source='").append(source).append('\'');
+        sb.append(", version='").append(version).append('\'');
         sb.append(", scores=").append(scores);
         sb.append('}');
         return sb.toString();
     }
 
+    public String getChromosome() {
+        return chromosome;
+    }
+
+    public ProteinSubstitutionPrediction setChromosome(String chromosome) {
+        this.chromosome = chromosome;
+        return this;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public ProteinSubstitutionPrediction setPosition(int position) {
+        this.position = position;
+        return this;
+    }
+
+    public String getReference() {
+        return reference;
+    }
+
+    public ProteinSubstitutionPrediction setReference(String reference) {
+        this.reference = reference;
+        return this;
+    }
+
     public String getTranscriptId() {
         return transcriptId;
     }
@@ -76,12 +116,12 @@ public ProteinSubstitutionPrediction setUniprotId(String uniprotId) {
         return this;
     }
 
-    public int getPosition() {
-        return position;
+    public int getAaPosition() {
+        return aaPosition;
     }
 
-    public ProteinSubstitutionPrediction setPosition(int position) {
-        this.position = position;
+    public ProteinSubstitutionPrediction setAaPosition(int aaPosition) {
+        this.aaPosition = aaPosition;
         return this;
     }
 
@@ -103,11 +143,20 @@ public ProteinSubstitutionPrediction setSource(String source) {
         return this;
     }
 
-    public List<ProteinSubstitutionScore> getScores() {
+    public String getVersion() {
+        return version;
+    }
+
+    public ProteinSubstitutionPrediction setVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
+    public List<ProteinSubstitutionPredictionScore> getScores() {
         return scores;
     }
 
-    public ProteinSubstitutionPrediction setScores(List<ProteinSubstitutionScore> scores) {
+    public ProteinSubstitutionPrediction setScores(List<ProteinSubstitutionPredictionScore> scores) {
         this.scores = scores;
         return this;
     }
diff --git a/biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionScore.java b/biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionPredictionScore.java
similarity index 63%
rename from biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionScore.java
rename to biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionPredictionScore.java
index fc04065f..671ac040 100644
--- a/biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionScore.java
+++ b/biodata-models/src/main/java/org/opencb/biodata/models/core/ProteinSubstitutionPredictionScore.java
@@ -19,16 +19,18 @@
 
 package org.opencb.biodata.models.core;
 
-public class ProteinSubstitutionScore {
+public class ProteinSubstitutionPredictionScore {
 
+    private String alternate;
     private String aaAlternate;
     private double score;
     private String effect;
 
-    public ProteinSubstitutionScore() {
+    public ProteinSubstitutionPredictionScore() {
     }
 
-    public ProteinSubstitutionScore(String aaAlternate, double score, String effect) {
+    public ProteinSubstitutionPredictionScore(String alternate, String aaAlternate, double score, String effect) {
+        this.alternate = alternate;
         this.aaAlternate = aaAlternate;
         this.score = score;
         this.effect = effect;
@@ -36,19 +38,29 @@ public ProteinSubstitutionScore(String aaAlternate, double score, String effect)
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("ProteinSubstitutionScore{");
-        sb.append("aaAlternate='").append(aaAlternate).append('\'');
+        final StringBuilder sb = new StringBuilder("ProteinSubstitutionPredictionScore{");
+        sb.append("alternate='").append(alternate).append('\'');
+        sb.append(", aaAlternate='").append(aaAlternate).append('\'');
         sb.append(", score=").append(score);
         sb.append(", effect='").append(effect).append('\'');
         sb.append('}');
         return sb.toString();
     }
 
+    public String getAlternate() {
+        return alternate;
+    }
+
+    public ProteinSubstitutionPredictionScore setAlternate(String alternate) {
+        this.alternate = alternate;
+        return this;
+    }
+
     public String getAaAlternate() {
         return aaAlternate;
     }
 
-    public ProteinSubstitutionScore setAaAlternate(String aaAlternate) {
+    public ProteinSubstitutionPredictionScore setAaAlternate(String aaAlternate) {
         this.aaAlternate = aaAlternate;
         return this;
     }
@@ -57,7 +69,7 @@ public double getScore() {
         return score;
     }
 
-    public ProteinSubstitutionScore setScore(double score) {
+    public ProteinSubstitutionPredictionScore setScore(double score) {
         this.score = score;
         return this;
     }
@@ -66,7 +78,7 @@ public String getEffect() {
         return effect;
     }
 
-    public ProteinSubstitutionScore setEffect(String effect) {
+    public ProteinSubstitutionPredictionScore setEffect(String effect) {
         this.effect = effect;
         return this;
     }