Moved some bootstrapping code into the Engine