Issue 5 - Latest updates for Subscription model