Refactored to new subscription API