Files generated improvement