Refactor for sample package.