With file-system saving support