Made AddSubscriber a bit more generic