Add the store and recover functionality