Add subscription support