Changes for official package.