Passing dependencies to *SaveWithImports and changing blocks/elements xml format.