Variable saving moved to Variable service