Add raw_save + fix id pass to edit method