Added subscription tier/level support