Update order of loading and bootstrapping