better subscriptions structure