Improve loading substate management