DataFile improvements