More load/save, added device id