Added subscription functionality