Adding the  data classes definitions
Merge remote-tracking branch 'origin/master'