Improve subscription process