Add Data class
End of Data class implementation
Merge branch 'develop'