Adding subscription functionality