Subscription optimization

shape