Add save mecanism