Updated subscription support