Refactor + Xml save