Update subscription changes and streamline packages