Performance enhancements. Subscriptions are smaller