Reverted a few steps back and readded subscription-awareness