Overhauled resource section handling