Adding basic subscription support