Completely remade saver architecture