Add save context interface