Added save raw data + some checks for files with meta-data