Refactor for package