Update for package refactoring