CF #27 - Add and use new subclasses of Subscription