Rely more on package