Switch back to using package