Updated subscription functionality