Improve subscribe sections