Refactor , update save method in some entries, close #22