More refractoring in resource section