Added save for software and devices