Data storage format improved