refactoring composite subscriptions a bit