More changes were made to enable plugins.