Add option to save Location