Improved performance of SUI saving/loading