Do not encode the filename twice
Added new devices (to be split into a data file)