Issue #77 - Refactored Subscription model.