Restore and Save implemented. Container has been refactored.