Fixing some issues with different data structure.
Updating data and build.