Refactoring the subscription system and expanding it to support multiple sites per user ^{^6}