Changes to match with the loader.