Subscription Refactoring + Notice when offline