More adjustments to faker files