infrastructure: tweak subscription process.