ZVISION: Refactor of save functions