Updated package references and enabled package restore