Flattened the loading process
Expansion no longer use xpath (checkme)