Make use of new subscription mechanism