Adapt old files to current format
Another way to write it