Added save mode hack support