Reorganize headers and extend Data API
Fix 32bit compilation