Adding save point functionality