Added basic subscription functionality