Forgot to build Data classes, done now
Merge branch 'feature/data-classes' into develop