Save from gui support and refactorings