Moving things from executor to bootstrap