Added AfterSave method and unfinalizing after save.