Ensuring local data storage is done well