Add stunt saving code